build: Use glibc's xattr support instead of requiring libattr
authorDaniel Svensson <dsvensson@gmail.com>
Wed, 1 Apr 2015 07:45:20 +0000 (09:45 +0200)
committerColin Walters <walters@verbum.org>
Wed, 1 Apr 2015 10:35:53 +0000 (06:35 -0400)
Fixes the build on Debian, and is one library less.

Closes: #78
configure.ac
libglnx
src/libostree/ostree-repo-checkout.c
src/libostree/ostree-repo-commit.c
src/libotutil/ot-fs-utils.c

index 4042524087ea41f5da038a1a7ddb17b238b050d4..e11be41e746396d39ce76592fb7194e3f9e6a03c 100644 (file)
@@ -39,7 +39,7 @@ AC_ARG_ENABLE(installed_tests,
               [enable_installed_tests=no])
 AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
 
-AC_CHECK_HEADER([attr/xattr.h],,[AC_MSG_ERROR([You must have attr/xattr.h from libattr])])
+AC_CHECK_HEADER([sys/xattr.h],,[AC_MSG_ERROR([You must have sys/xattr.h from glibc])])
 
 PKG_PROG_PKG_CONFIG
 
diff --git a/libglnx b/libglnx
index 08d1339f9a61c0b437a623e68ebf2c64258d6087..d59a63e3e650aa75a055e4ede523790d60645435 160000 (submodule)
--- a/libglnx
+++ b/libglnx
@@ -1 +1 @@
-Subproject commit 08d1339f9a61c0b437a623e68ebf2c64258d6087
+Subproject commit d59a63e3e650aa75a055e4ede523790d60645435
index daca66eeb928396049d48f29eb60006ffaaf6a69..22aaf56455f96e1034676a2ae34eed1b38747310 100644 (file)
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <glib-unix.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <gio/gfiledescriptorbased.h>
 #include <gio/gunixoutputstream.h>
 #include "otutil.h"
index ce5aa0793605208cbea0fe0e0ec00f574c99b386..6ba606fe1d6183b6a0f75930d6710dc406c50beb 100644 (file)
@@ -34,7 +34,7 @@
 #include "ostree-checksum-input-stream.h"
 #include "ostree-mutable-tree.h"
 #include "ostree-varint.h"
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <glib/gprintf.h>
 
 gboolean
index 7137b829657d51934ca9e12046474e3a52107ed2..040636bd57167d2966b196a85892472016d6ee72 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "ot-fs-utils.h"
 #include "libgsystem.h"
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <gio/gunixinputstream.h>
 
 int